bug 3208: split the other meaning of filedesc to fileuploadsummary, which is wikitext

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 15175d1..e8f371e 100644 (file)
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -530,7 +530,7 @@ class UploadForm {
                $sourcefilename = wfMsgHtml( 'sourcefilename' );
                $destfilename = wfMsgHtml( 'destfilename' );
                
-               $fd = wfMsgHtml( 'filedesc' );
+               $summary = wfMsgWikiHtml( 'fileuploadsummary' );
                $ulb = wfMsgHtml( 'uploadbtn' );
 
 
@@ -565,7 +565,7 @@ class UploadForm {
        <input tabindex='1' type='text' name='wpDestFile' id='wpDestFile' size='40' value=\"$encDestFile\" />
        </td></tr><tr>
        
-       <td align='right'>{$fd}:</td><td align='left'>
+       <td align='right'>{$summary}</td><td align='left'>
        <textarea tabindex='2' name='wpUploadDescription' rows='6' cols='{$cols}'{$ew}>"        
          . htmlspecialchars( $this->mUploadDescription ) .
        "</textarea>

diff --git a/languages/Language.php b/languages/Language.php
index 6041ab1..bff57b1 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1012,6 +1012,7 @@ To include the image in a page, use a link in the form
 'uploadlogpagetext' => 'Below is a list of the most recent file uploads.',
 'filename'             => 'Filename',
 'filedesc'             => 'Summary',
+'fileuploadsummary' => 'Summary:',
 'filestatus' => 'Copyright status',
 'filesource' => 'Source',
 'copyrightpage' => "Project:Copyrights",